add missing dependencies and manual fix