More source adjustments to resolve compilation errors