Fixes for missing template values