Magda fixes