Missing default values

Review 1631 by @larkost