Another update attempting to fix some compilation issues.