corrections for SONARPLUGINS-3620