Revert "minor fixes"

This reverts commit 1fac59fe4c9d7e1d1b422652e0bf37c6a70c79cc.