Some fixes for pre kitkat