Fixing up build patch