Fixed other issues found in 2023.2 (alpha & beta). For details, please refer to the comments.