Yay, did some fixes [#2]
Resolved [#2 state:resolved]