self review fixes