and again some patch fixes