Revert "Minor improvs"

This reverts commit 2f40070d31b32536b8e19156db807d385cfa3bc4.