Starting to fix template compile time errors