More tweaks to vs settings