More sonar fixes + markdown hotfix