some case fixes