Should fix Note 2 build errors