Fix Imports for Commands