Fixed issues with web elements