Revert "Revert "Small changes""

This reverts commit cf3cb812b64b16235b566596394455ac1fd2e00b.