Minor fixes, labels, etc