fixed sentries and milestone handling