More fixes

'cause auf likes to pull PR's I haven't even finished yet.