checkout bug fixes