Changes to prevent trailing %