Some more changes that reduce the compilation errors, but there is still one more issue remaining