Fixes from chirarobert review