Address various review comments