Revert "small fixes"

This reverts commit 177ae47707a1b22dc6257ebdfe9d2cd1926b41ef.