Add deps and fix build