Client side things
Fixed build