Some fixes for jenkins

Another fixes for jenkins. There still are some issues on upstream that I have issues to debug.