Fixed UE related bugs from improvement