Updated dependencies versions and solved minor issues

Change-Id: I381ef77babc762f3544f66c8f7ee013440e46685