Revert "small fixes"

This reverts commit 9ae9b8ef35624b6f0cda3efb3cc342e4514e2940.