Fixing old compile issues