Initial attempt to fix Jenkins bugs