Quick fixes

Added collectively in the meeting