Fix some warnings from recent changes.