More small changes to get the current structure compiling.