Fixes missings default values in some cases.