More compile cleanups