Fix creation of instances.