Various fixes

@miked-mellanox Could you have a look at these 3 fixes?

The first one is important.  The 2nd one is trivial.  The 3rd one adds 2 new funclets.

Thanks.