Changes to match jar updates