Fixed /unstuck and floating items

Again my try to do a pull request for the same fixes