Merge pull request #1100 from jmaas/master

A few small changes