gcr 3.3.2.1 - Fix build issues