Fix hints (nearly)