fixing templates for use in basenode