Minor improvements to 12