https://bugzilla.kernel.org/show_bug.cgi?id=73931
--- Comment #3 from Alex Deucher alexdeucher@gmail.com --- Created attachment 132231 --> https://bugzilla.kernel.org/attachment.cgi?id=132231&action=edit possible fix
Does this help in the second case?