Fight and Magic fixes