Fixing some module import bugs