Deps changes were not complete, tested and fixed