Corrected some things in template project