Address remaining review comments