Fixes for external dependencies