Bug fixes before release