Small backwards-compatible changes to API