Adding fixes for movement of items