Two fixes for view helpers