Fixed some issues with CLDevice