Fixed more small bugs