Build System Fixes