Fixed issues with dependencies