Minor bugfixes and shift to the latest ProB2