More e.g. fixes