fixes: WIP from latest review