Some additional changes to DBFS

I wasn't convinced it was actually working correctly.