Fix some remaining problems.