intermediary fixes