HOT Fixes... which are still needed