Fixed some more small things