Merge pull request #2364 from alex/cleanups

Some cleanups