Various fixes and tweaks to magnets