Testing IDEA and pushing multiple fixes to issues found when playing with debug modes