further adjustments trying to appease the server gods