Fixing more compilation problems caused by recent changes