fixes for new server