Fixes per Mark's notes on Piazza