Port Fixes #1644