Fixes maybe for AD