Fixes for Tweak Template