Fixing some defects in first pass of support for new reservatio types.