Some unreviewed changes that make api work