git and dependencies bugfixes