wave access fixes