Fixes from comments. Also fixed mr jobs clashing and causing builds to break when run in test