Fixing build issues