Update to match changes in defaults