Fixing build targets