#4137 Fixing build issues