Some fixes II