Fixes to pass bugzilla template tests