whoops other fixes