Jenkins script and small fixes