Minor changeeees to views