Remove some small BUGs, no referencing to zend view

Change-Id: I6edcc7a2144512a34102232993badbf3d68298a8