Fix for internal API changes

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>