using fixes for stricter gcc template usage