Merge "Address leftover comments"