fixes for device related issues