Various small adjustments to APIs