Some minor fixes and touchups