Small fixes for building on systems other than my laptop