Grabbing some minor updates from smockle.