More Build System Fixes