Minor fixes for other build environments