Additional review fixes