Add in missed substitutions