Small API updates