Additional fixups