Another set of bug fixes on CasualConc 2.0