Device-specific : Fixed some warnings