Bug fixes + Checkin events changes