more case fixes