Bug fix and configuration update.