Small changes based on Piazza