QuickMagic bug fixes