Revert "minor fixes"

This reverts commit fa53180f94aa308a110e88363db28db3c6b9b6f5.