All of the fixes from Jason not related to the engine