Bug commands fixed