Small tweaks
Merged