Minor fixes
Implementing API changes