Small changes to the menpofast part