Cmdlet fixes

Fixes to address issue #245 and #248