A few fixes to improve suggestions