Fixes for 16387744

Few fixes for commit 16387744.