Fixes and improvements

No match.