Minor changes for Cancer templates