First wave of issue fixing