Bag of DEMO fixes and tactical breakages