Fix various bugs uncovered while getting fib to work
Provide better ICE errors