Dependencies update and fixes from my vacation

Nothing big though, only few little things.