Merge pull request #15 from dreispt/fix-views

Fix view errors after upstream changes