Fixed some references so the solution builds fine