Couple of fixes, not working when taking pieces