Misc template cleanups / fixes, and some birthday code cleanups