The next row of small fixes... We are below 100 commits to go now! It's getting closer to the end than ever!