More fixes

Mostly works. Just some bugbears