Bug fixes in calculating/assigning sidepots