Fixes to registration templates