[WIP] Minor fixes

Fixing various minor issues thrown up during client testing. Can be merged at any point, but I'll carry on adding to this branch as things come up.