Bug fixes relating to certification