These will both be addressed in the next release. Thanks for the due diligence.