Correcting deprecated stuff