SONAR-4884 Fixes after demo