Fix issues identified by the diff