Few fixes for views