Hello,
Take my apologies for the delay in answering. Yes, both things will be fixed in the next theme update.
Regards