MInor fixups