Compilation fix 2 + callback fix