Tried to eliminate more build errors.