Merge pull request #728 from mcmonkey4eva/master

Pull request for weird minor issue fixes