Small fixes to havings