minor fixes
Revert "minor fixes"

This reverts commit 1d72b0d31048ee71cf7cab0af5447c33f11d513d.
minor fixes