[Gameplay] Master Yi Bug

So I have two bugs here, but actually im not sure if 2nd is bug or not.
First: As Yi main I have noticed that when I have my passive on 4th attack (double attack) sometimes when passive is near end Yi will start attacking and if passive ends during his strike he will stop attack and I would have to wait for next one, normal attack (based on my attack speed). So if possible make his attack without that stop attack if passive ends while he is striking (just reset it to 1st strike instead of stoping whole attack) Second: I noticed that when I cast W (Heal), while heal is chanelling if I activate Mercurial Scimitar, Yi will stop his heal and move two steps forward. I just wanted to remove some damage over time from me while healing and that happened which I didnt expect.