Fixes requested by Sharon.