Fix defaults if not set