Some fixes (WIP - dont merge immediately)

Got a few more fixes to add.