Many thanks to @mv-gh for these quick fixes.