Fixes for imports causing errors.