Revert "non-critical fixes"

This reverts commit c80618d168aadc0eea6536f7c6de67571e1415f6.