Fix more templates where static() needs to be used