Small tweaks for potential future editing