EXTAPI-89
- minor fixes