Some minor updates and fixes.