small fixes
Revert "small fixes"

This reverts commit e3db86c3b94214e164d8e19070fb3cd244c92112.