Misc fixes so that everything will build