Ini adjustments in order to reflect the latest Metropolis changes