few sonar related fixes, trying sync blocks-
> needs readwritelock