fix problems from errors from the future

@jcheatham