Miscelaneous improvements.