Misc tweaks for switching to mx queues