Correcting Some Bugs