Committing automation fixes