Booking module fixes