Thanks for the feedback. We have created an issue for both these issues and will get them fixed.