Bug fixes and improvements, including DCP 123 and DCP 179.