Bugfixes to Get-CM* cmdlets