See if these extra thingses fix things