More partial trapping moves fixes