Fixes needed for Kit Kat