FIX: More hetr fixes