Add some fixups to make creating instances easier.