first pass on build fix
more build fixes