Fixes to STP template