Tweak KVC cases