Fixing a few regressions that appeared during the final release tests