Season 6 First Patch

A small patch fixing a few issues that have been discussed on the forum: