Fixity-fix

#2571
I'll maybe fix more stuff today...