Fixes for views