Fixed deprecated stuff
Merge resolved