Misc changes (idk)