Random Command Fixes