Fixed problems after library version changes