Fixed some issue for the starter template