WIP code review fixes