Fixed minor API issues