Fixes 1.8.7 incompatibilities in the views