+1 to both changes.