Port fixes #1780