More case fixes and misc stuff