Minor build cleanup
Fixes