Fix some remaining issues.