TWRPify Fixups

Change-Id: Ia41cba6107308de3e60434f837af02099229c469