Revert "quick fixes"

This reverts commit 9dcaf6fd3f154bbe93ccf1c454e8d5bc02b6aeff.