Merging in issue fixes.