Fixed build targets