Port Fixes #1246