Minor changes. Disabled template preprocessor in debug mode