First wave of fixes (alpha release)