Thanks for the report, I addressed the second bug and the first bug I'm not sure how to reproduce actually (or not entirely sure what you mean)
