#1384 Small tweaks