HiRISE and CTX fixes