Minor fixes and touchups