More fixes for consistency of API