Feature/defaults fixes