Bug fixes for resetting to default.