Minor build-related stuff