Fix persistent handling bug
Fix using reserved word problem for Android 2.x.x