reverting unfix...
Revert "small fixes"

This reverts commit 0928d8ea26f9a960653458778a8c23656a610ec5.