Can you please make one last patch addressing two specific bugs?

Printable View