minor robustnes enancements