Fixing compilation compatibility