Some TWRP fixes