Fix model binding edge cases.