FIxing errors