Fix misc bugs with new reservations logic