Fix the way defaults are handled