Bunch of compile cleanups