Feature/fix jenkins build

/cc @rmg