Change a few calls to defaults module