Updates for Thor5/6

Quick sync with the updates for my satellite package