Floor refactor MkII: Fixes a few potential bugs