Fixing some shadow magic numbers