Celia18305 A few updates (#1355)