Inject metrics to be printed
Cleaned up some special conditions