Misc Fixes in Comm Commands