Some ViewHelper fixes