Fix up some API violations