Cleanup some out ignored warning API leftovers