Fixed commit bugs