More little fixes.