Hi,
I've seen from other recipes that adding the line
fixes my first issue (probably as a side effect, but it seems to work).
If the second one isn't possible now, could you implement a switch to disable it or a function to override in a future version of calibre?
Thanks,
Steffen