More build system cleanup/derp fixes