Fixes for F buffer ops change