Fixes #1030
Fixes #1031
Merge pull request #1032 from emmanuel-keller/1.5

Bug fixes