Fixed missing imports from lumien231's commit