Fixes and robustness