Fixed issues for 1.7 version of orientdb