Some dirty fixes