Bugs in previous checkin