Fixes some bugs in views
Merge branch 'slave'