Misc import and fatal fixes