Minor changes for new tweak