Fixed some more small bugs