More fixes

Fix a few bugs, some things still don’t work.