Fixing missed imports #2