Some fixes for bandwidth provider