few fixes for newer iOS