Some minor build changes