Some corrections to previous patches