Fix various review comments