Revert "small fixes"

This reverts commit 8a9be82f38937db5c338ab8da79643430b5aad6e.