Bug fixes and code cleaning

No match.