More robustness bug fixes