block: CFQ tweaks

Originally from Francisco Franco <franciscofranco.1990@gmail.com>