fixed a couple of compile errors, and split dynamically managed imports from statically defined ones