Minor updates resulting from internal discussions