Updated dependencies
Fixed compatibility issues