Fixing more compilation issues