Fix issues with contract server

Added an item for it in Pivotal.