Bug fixes and improvements

  • Changes necessary to support RCPCH database upgrade