Revert "some fixes"

This reverts commit cd03c8e8d72452550c17b4f5394ab3fcf5eda9c2.