Eureka

Thank you for these fixes, seems ok to me.