Revert "Fixes"

This reverts commit db8ef2daa09b24b4c8816b605d45e596fb590cdc.
Revert "Revert "Fixes""

This reverts commit 86743a09236c19c3c82c0fae10b5dbe8af3e519b.