Final check and corrections