Fixes for import errors