Some fixes and deps update