Fixing compilation bugs from old dependencies