Fixed issues encountered on web test