[minor] Move these two above the builder?