Fixing Template issues