fixed some device related issues