IMAGES: Proposed HTF fixes from CRFB