Load from server and a couple of fixes