Fix and hints