Small tweaks

A few tiny tweaks, that can use double-check, @devgeeks.