Some preliminary changes based on Google feedback