Fixed a couple of TODO items after all modules are imported