Forgot to save the bugfixes from last session, whoops