Fixed earlier errors so it builds.