Fixed bugs in last checkin