more dirty fixes