Fixing build problems