Merge minimode improvements and a Disobedience bugfix