Fix accessors.