Fixing up accessors.