Minor internal improvements