Small fixes to build on my machine; small cleanup