Minor fixes and changes, really nothing even worth a commit message