TWRP: Some fixes