Fixed more two bugs