Missed a few template to source conversions...