Correcting initial issues