Guard against more API insanity