Activity: Fix #326
Magic: Fix #114
Merge pull request #448 from iulianR/issues

Bug fixes