Merge in the defaults where they're needed