Adding in small changes
Merge branch 'release/V3-tweaks'