[astute] Fixes after review.