Few minor tweaks to views & schema