check in/ out fixes