Small changes to fix some stuff breaking during test on server.

Change-Id: Ibe20e20107c8b7b872bd24c49283f81459aea234