Correcting warnings