Marios Chatziangelou patches to improve handling.