Miscellaneous stuff

Hopefully a fix for the desync