Fixed issues with missing dependencies