Fixing some UI blocking problems.