Fixes for upcoming code changes.