Corrections to defaults handling.