Remove defaults and fix nil case