Various small fixes
Change cancel method to use booking objects