some fixes for commits