Fix up some confusion in Template, fix building in Sand Trap