Fixes according to Vivien comments #2