Some small fixes

Made some small fixes. Things that caught my eye.