Cleaning up most recent commit mistakes