General fixes (including strings).