Small tweaks, const etc.