Minor fixups to support files