Minor fixes / consistency changes (API build #678).