Booking fixes