Fixes for view helpers