Updated marek templates
Fixed interesting compilation issue