Fixed remaining UT crashes