Fixes per Katrina's notes