Merge pull request #912 from narfbg/develop-fix-fh

Fixes for two previous commits