Make some values have a default and fix handling unset properties