Checkin and spots tweaks