Revert "minor fixes"

This reverts commit e9c4efc85d49c76de635b8a7d301ca3472a7f774.
minor minor fixes