Reverting prop changes and other thing fixing up logcat errors