More Monitoring and a fix on the bpm conversion
Back to have the merge OK
Clean ups