Re-commit some stuff