Remarks and fixes