Added patches by stopbugging