Fixing more compilation problems