Update packages
Dirname fix?