Minor changes to master template