Attempted fix of some hole punching issues.