Bug fixes. More and more bug fixes.