Speed up builds
Fix bad cut-and-paste