Small fixes (Command execution)