Commit some fixes