Revert "minor fixes"

This reverts commit 58845c642d7dacc5b032a5c3418b292c1580e7ea.