file-push server fixes