Quick pre patch fixes