Open Cascade 6.3 Code Fixes