Update module install calls and fix dependencies