Fixes to hints