added a few missing template parameters