Added support for fixing prototype spillings