Fixing build bugs