Fixes for some build system warnings