Fixes for TWRP