fixed a couple of public service bugs