Fix scaffold templates