Latest fixes to be stable