Fixes to Availability linking and interface definition