Fixes in Templates (#421)