everest: Bring more in line with stingray

Mainly from the Telstra 4.0.4 update.
14 files changed