Handled remaining external asset issues