patch fixes