Minor robustness fixes for debugging.