Added missing dependencies
Tentative install fix

Respect new conventions