fixing some things so it builds