Fixed issues in 26.2