More Bed Fixes