More fixes to get site running

Change-Id: I9adbb8d3d18b735b197969fcb0b5e272a0a02830