(Some minor build improvements)