Fixes for OOIION-990 and OOIION-988

No longer restrict get_capabilities() in policy