Fixes for dwf's suggestions.