Fix up a few values

Change-Id: Ia8cfc50d7cad9bafa9fde5fa627fcfbf23724ff8