Minor fixes into views