Changes to make jenkins build work