Import improvements and cleanups
Fix import stuff