More minor year specific updates

Change-Id: I249142545ee72aa604c26f405b62d0e3ccec2b4a