Fixed some problems

I have fixed some problems.