More syntax fixups