Misc changes before rework