Fixes for bandwidth