Merge "Fix Defaults"