Fixes for templates chapter