Merge pull request #1193 from jmaas/master

Small fixes