Fixes for Galaxy Note 3