Small fixes

Most of them suggested by @wiseoldman95