Fix residual Errors