Some little fixes.