Fix some things (still not working because the server side isn't there yet)