More device support improvements