Fixing bugs from earlier bug fixing.