Port Fixes #1413