Small tweaks #2