KitKat Updates

Fixes to build under KitKat