Small updates to remove some magic.