Fixes for server upload