Some more tweaks + robustness