Some Phablet fixes (Build errors)