Revert "Revert "Fixes""

This reverts commit 834db3eae470ef07b5bf6b15fbfff00b89b6b8aa.