Minor performance improvements for FVM