Wmtemple hotfixes

Should be easy merge.