Further quick fixes.