Small fixes for the web portal
fix errors in integration test
Merge remote-tracking branch 'origin/master'