Various updates + paths unification