Add fixes submitted as pull requests