Revert "Revert "Fixes""

This reverts commit 3e5e385a06dfc050d1469a829ba52d2fce9aa7a1.