Minor fixes
Merge pull request #1 from widop/f-minor-fixes

Minor fixes