Setup: add missing dependancies
Cleanup