Hopefully this is the last set of changes to appease the mighty jenkins