Small tweaks, no functional changes