Some fixes ii