Fixes in imports