Fixed bugs with importing from modules.