Pull request for weird minor issue fixes

An entire PR just to fix small minor things! Unless it takes too long 'til it gets pulled in which case who knows what'll be in here by the end of the week...