Some bug-fix changes.