Bug fixes again.