Fixed issues in WaitBot and BasePage