Fixes some things we were testing (evil commit)