More magic fixes.