Fix twrp issues