Review fix, and fixes for other things I found