Fixes for server side update