UI compatibility fixes