Kitkat compilation fixes