Fix: forgot to re-apply geometry optimizations after BGF refactor