Various little fixes.