Bugfixes with views