More hacks on build system