Fixing tweak problems