The first issue should be sorted out on your site.

The second issue is giving me a bit of a headache. Need some time to look into this and maybe can soonest provide a fix in the next child theme...