Template fixes.
Updating to the latest template project code.