Make stuff less defensive