Revert "small fixes "

This reverts commit e6451df3ee1925ce3654e48f51ef1048fe3cbfdf.