Tiny HOPE tweaks

Most recent round of tiny requests from Mastek / DSI thread.