a few remaining changes to core from the custom_server branch