Fix command/base/host