Fixed bugs in Gwendy and Magnus