Live Templates - some fixes