(a few more) Minor modifications