Floor refactor hotfixes

Fixes #5583
Fixes #5585