Fixed command issues