Minor changes to satisfy #830