Fixes for bad imports