Minor performance improvements (FVM)