Fix imports
Fix some other lame exceptions.