Correcting various problems