Minor updates based on review