Fixed smal issues with Chechkout