Fixes to build-flags