Revert "Revert "Small changes""

This reverts commit bcff4ddd35fe85c0ade033c2ba244ea726520722, reversing
changes made to 4ce20d699a2da2052a8bf10e83d315f8d71d770f.