Build cleanups and line fix