More minor commits...