Change defaults to the ones we actually use