float-drawer fixes