Fixes requested by Robert.