Bugfixes and Viewhelper updates