Fixes based on Amy Brown's checking