Minor API updates