2 Commits (Dev_Cmd_Fixes)