+ Some minor fixes.