Some small changes for mpfire V3