Handle defaults properly