!htp add some FIXMEs and small fixes
Merge pull request #16584 from akka/wip-16580-FIXMEs

!htp add some FIXMEs and small fixes