Fixing a couple more minor items.