I think it would be good to try and patch these issues and submit the patch upstream.