fixes for server upload