Fixed issues with Note 3