Two small adjustments that came up when running in debug mode.