See attached patches.

Best regards,
Stefan Kangas