Merge pull request #835 from pcercuei/misc-fixes