another set of fixes, I dunno