couple of fixes in views