Resolve minor review fixes