WIP: review fixes