Fixes for root error handling.