A few minor modifications