Additional fixes, mostly due to changes in schema for procedure orders and results.