Revert "Fixes"

This reverts commit 831d7869aacf0f332320933c02581b38a63522d3.