Several fixes and dependencies update.
This will create a new commit in order to revert the existing changes.
