Revert "some fixes"

This reverts commit 76cd1aac5c3ca9cc8508822cb40eb1216af26d41.