SS-597 quick fixes for MightAPI service broken by changes to right_support