fixes for on server