fixes for bypass