Template URL Path fixes