Fix some hint bugs