Change nullOnly to override, Fix behaviour in specs