Improvements & fixes

No match.