Fixed a few niggles in the booking system following plugin upgrade