Pbsserver fixes