Fixed hinted issues