Bug fixes for warranty.