Last fixesfor jenkins