Clean up some small compile-time issues