Fixed certificate stuff