Ref #16 - Small tweaks