Fixed commit issues