Merge fix. Minor additions.