gcr 3.3.3.1 - Fix build issues